# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1087  -> 1.1088 
#	 include/linux/jbd.h	1.22    -> 1.23   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/15	eranian@hpl.hp.com	1.1079.1.12
# [PATCH] ia64: perfmon fix
# 
# This patch allows users to set the PMC to their default value, even
# though the value might conflict with the type of monitoring
# session. This is fine because default values ensure the monitor is not
# active.
# --------------------------------------------
# 03/05/15	arun.sharma@intel.com	1.1079.1.13
# [PATCH] ia64: make ia32 ioctl()s work again
# 
# --------------------------------------------
# 03/05/15	davidm@tiger.hpl.hp.com	1.1079.1.14
# ia64: Fix obsolete call to ia64_set_fpu_owner() (affected UP only).
# --------------------------------------------
# 03/05/15	davidm@tiger.hpl.hp.com	1.1079.1.15
# ia64: Re-enable -frename-registers for McKinley.
# --------------------------------------------
# 03/05/15	davidm@tiger.hpl.hp.com	1.1088
# Undo previous pasting-operator "fix".  Code was right and pre3.4 compiler was
# (temporarily) broken.
# --------------------------------------------
#
diff -Nru a/include/linux/jbd.h b/include/linux/jbd.h
--- a/include/linux/jbd.h	Sat May 17 00:06:34 2003
+++ b/include/linux/jbd.h	Sat May 17 00:06:34 2003
@@ -279,9 +279,9 @@
 			printk(KERN_ERR why);				     \
 		}							     \
 	} while (0)
-#define J_EXPECT(expr, why...)		__journal_expect(expr, why)
-#define J_EXPECT_BH(bh, expr, why...)	__journal_expect(expr, why)
-#define J_EXPECT_JH(jh, expr, why...)	__journal_expect(expr, why)
+#define J_EXPECT(expr, why...)		__journal_expect(expr, ## why)
+#define J_EXPECT_BH(bh, expr, why...)	__journal_expect(expr, ## why)
+#define J_EXPECT_JH(jh, expr, why...)	__journal_expect(expr, ## why)
 #endif
 
 enum jbd_state_bits {